last version merge failed, merge done now