Remove button/link to resolve conflict via the web
Right now, a conflict can't be resolved via the web interface. You end up with a change in .git which is not present the .hg repo. Then things get complicated (or just plain broken).
Until this is possible, it would be a good idea to remove the link/button so one can't be even tempted (or expect it work) and clic on the button.