Merge
Update IgnoreFile