When I have to merge a branch full of conflicts ⌘ Read more