The lion does not concern himself with merge conflicts