Fixed merge changes-failure