Let me help you with that merge, git