Fixed project/filter files after merge conflict