solves conflicts with cli updates