some renaming
resolve merge conflict