fixed conflicts between branches