EU and China back on track to conclude trade deal