resolved conflict
conflicts appear
fixed conflicts