Why did Git change the code?

Question

git

Why is this happening?

Answer 1

This is a version conflict.

Answer 2

The WebStorm you have open has a great conflict resolution tool.
Through the menu first do Git->Commit.
Then in the menu Git -> Fetch (pull all the latest changes from the server into the git cache).
Then Git -> Pull.
If there are conflicts, the conflict resolution tool will open.
Everything is visually easy to understand what is merged and where. On the left you have the changes from the server, on the right are yours, and in the middle is the result that you can edit.