Fixed some merge problems
Fixed some merge problems