Merged files help! [resolved]