Fix some files with unresolved merge conflicts

Fix some files with unresolved merge conflicts