conflicts  resolved