Amend merge issues