trying re commit, merge failed