small merge problem