Error: Your local changes to the following files would be overwritten by merge

How do I manually combine just to allow me to do this update?

Looking further down the line how do I contribute?