Fixed some merge conflict errors