fixed conflicts and formatting