cleaning up
fixing merge conflicts