merge conflicts, part deux