Fixed some of the conflict issues