Update so no conflicts