resolves conflict