Merge issues

Fixed merge issues I created, I'm such a noob.