added a few merged cells
Merge branch 'master' of https://github.com/SchwartzNU/PreferenceFiles