Fixed projektfile after merge