manually merged old directory