merge pansy's work