restore changes after the problematic merge again