Understanding merge conflicts using jetbrains phpstorm