Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

    deleted by them:    community/views/feeds/findmypast.py
    both modified:      engine/findmypast/engine_settings.py
    both modified:      engine/findmypast/templates/base.html
    deleted by them:    engine/findmypast/templates/community/roar/includes/findmypast_navbar.html
    both modified:      engine/findmypast/templates/dynamic_content/community/frontpage.xml
    both modified:      engine/findmypast/templates/mustache/roar/posts/giant_splash.html
    both modified:      engine/findmypast/templates/mustache/roar/posts/giant_splash_internal.html
    deleted by them:    engine/findmypast/templates/mustache/roar/posts/news_video.html
    both modified:      engine/findmypast/templates/mustache/roar/posts/posts_recent.html
    deleted by them:    engine/findmypast/templates/mustache/roar/posts/square_news.html
    both modified:      static/css/roar/findmypast/layout.css
    both modified:      static/css/roar/findmypast/splash.css
    both modified:      static/js/widgets/views/edit_mode/suggested_subpages.js
    both modified:      static/js/widgets/views/entry_suggested_subpage_group.js