added file merge (still a bit rough)