make it better
merge