Cleaned up
Fixed merge conflicts