this is a prod bug fix
resolve merge conflict
notes