settingup conflict
conflict setup in conflict branch
fixed conflicts