Git in conflict

I merged everything through console initially but then I received a mail.