unify changes for the live site