Changed history and favorite cells
Fixed merge conflict