Fixed merge-formatting