BP: fix residual merge conflict
BP: fix residual merge conflict

joprice/factorie,strubell/factorie,zxsted/factorie,digitalreasoning/factorie-scala-210,factorie/factorie,hlin117/factorie,malcolmgreaves/factorie,melisabok/factorie,asubbaswamy/factorie,Craigacp/factorie,patverga/factorie,pogren-oracle/factorie