WebStorm config updates
Resolved merge conflict