merge brett updates