I can merge the code but think that you don't used git when you changed code in the server, so now the only thing that you can do is have just 1 commit with all the changes.
i have some git tutos but in spanish if you want them, is a really complete tuto about git and github, but if you only want the guide, is ok too.
if you are ok with that, Ill make the work for you.
trying to make my first job here, never used the platform, but Ill do the best I can. Have a good day.