cleaned up code
fixed merge conflicts
fixed merge conflicts