remove the id from the servicejson and promote the filename (without extension) to id

merge-ready