fixed conflicts
resolved conflicts