Resolves merge conflict

Tsk tsk tsk.