Fix wait cursor in file resolution dialog.
Resolve merge conflict.