correct outstanding merge