Executing amend
resolving conflicts