fixta merge problem