version 3

slight amendment to merge error