After reading How do you resolve git conflicts in yarn.lock I tried to run yarn install to resolve conflicts in yarn.lock file, it worked, no conflicts in files, great... but WebStorm still shows it as conflicted.
I wonder how can I mark those files as resolved? There is a window for conflict resolving but I can only chose "accept theirs/yours".
