myfeature conflict commit