file conflict api, webinterface update