Changed conflitcs. Everything should be fine