fixed conflicts n shit