git ignore revert
Merge origin/videoresize into videoresize