Fixed some merge problems