git revert --strategy resolve 4d17793c2ab7a240243ba7762fe908cc7dc7c3c0