Fixed a bug in renameFile
Added a simpler function that ignores a file, runs an action, and then
unignores it (i.e. a variant without timer)
When handling a conflict we should also ignore any local actions to the file