Removed some conflict issues