DNN-6197 Fix bad merge of project file