Fix conflics