Set up Bootstrap 3 glyphicons.
Added data merge conflict handling.