Fix some merge issues. Whoops