Error after merlin merge