Fixed merge-errors