andrewt52 merge