Reset to b6258813f4e88fcb1a526c7618a26c4afc67eb58
Solve the conflict
Solve the conflicts in Rakefile