Trying to get around conflict

error: Your local changes to 'demo.html' would be overwritten by merge.
 Aborting.