Removed typos and unuseful stuff
Reolving dump conflict