some clean up
merge conflict