what's your rujiraviriyapinion on merge conflicts?
Yeah dawg?