Fixed some merge conflict