Merge "two more dirs"