merged & added files