Fixed some merge conflict problems