myfeature conflict commit
conflicts resolved