Fixed some conflict issues