I am a moron. Improper conflict resolution fixed