fixed all conflictsgit add .
fixed conflicts