fixed conflicts with merging