I get his error when i run
Make sure we have all the latest MinePeon packages:
cd /opt/minepeon/
git pullerror: Your local changes to the following files would be overwritten by merge:
etc/miner.conf.donate
Please, commit your changes or stash them before you can merge.