Merge projects into one WebForms project. Fix all conflicts