merged in old project files