adding files forgotten in merge