fixed prior merge text