merge shape branch