merged and fixed conflicts