one to one
merge and fix