Merged and fixed conflicts