fix conflict
fix conflict

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