continue parcticing merge conflics