fix conflicting word