Simple tool to merge git conflicts with rich UI using HTML5, JS