A street in Edinburgh has been reopened after an incident involving a man who had barricaded himself inside a flat was resolved peacefully.

Riot police had been called to Albert Street in Leith on Saturday afternoon amid reports an armed man was inside.

Police Scotland said there had been "concern for the male occupant of a flat" and sealed off the street outside.

The force said the incident was brought to a "peaceful resolution" around 5.45pm.