brand sprint 2 + conflict fixes