Fixed some derps in merging