removed extra merge file