remove duped lines from merge
allow php5-mysqlnd