Fixed some merge error stuff