Fixed some merge bugs