Two men were detained after police officers were called to an address at Waverley Park at 2.45pm yesterday following a report of concern for a person inside.
One man was subsequently charged and the other was taken to hospital following concerns for his welfare.
A Police Scotland spokeswoman said: “Local and specialist resources were deployed in order to ensure the safety of the public and officers. The operation came to a peaceful conclusion shortly before midnight.
“The men, aged 21 and 44, were detained at the scene.
“The 21-year-old was charged with a breach of the peace and will appear at Edinburgh Sheriff Court on Monday February 6.
“The 44-year-old was taken to hospital for treatment and will be reported to the procurator fiscal.”
John graduated from Telford College in 2010 with an HNC in Practical Journalism and since then he worked for the North Edinburgh News, The Southern Reporter, the Irish News Review and The Edinburgh Reporter. In addition he has been published in the Edinburgh Evening News and the Hibernian FC Programme.