Fixed conflict issues I think