resolves conflicts