amended merge conflict