Fixed Some merge errors