Removed git merge artifacts. Tsk tsk tsk.