Merge conflicts, dang