Fixed some merge issues
Fixed some merge issues