amend merge error