Forgot to remove git merge conflict

DERP