cleanup
fixing merge conflicts with github