Error after merge