resolve previous conflicts