Resolving conflict error with WebStorm File .idea