added files deleted by merge with devel