resolve conflict
(#376)
Merge branch '#376' of github.com:GalSim-developers/GalSim into #376