Keeping production and master in sync