Fixed some conflict errors