on amend
conflit resolu 1