Merge two files

i have two repos in two servers
i git pull the repo from server A to server B
now i get these changes
how could i solve them ?