merge failed