Merge conflict? I feel so stupid...