merging again
correct merge markers plus latest from george