Commit before run
New version
Fixing conflicts