cleaned away github merge markers so code runs
fixed github merge conflicts to allow code to run