Fixed file project after merge.