Merge conflicts have duplicated files in the project brozer.  Cleaned it up.
Project file couldn't recognize some changes so did them again.