Changes to Resolve GitHub sync conflicts

post/api/apps/{app_id}/github/sync/resolve-conflicts