cleaning up
merge conflicts resolved