Cleaned up code
Fixed merge conflicts
merge confs