Cleaned up the merge issues

Ugh...