Revert regression introduced with conflicts resolutions