progress on mysql merge