Highway repairs
Updated gitignore for UniMerge