Merge and fixed conflicts