get rid of SNotationStyle; add SNotationViewPart
fix merge