cleaning up for release
fixing merge conflict