Project merge conflict fixes.
Fixed project merge conflicts.