Messing up with history
Fixing a conflict