Fixed merge-error