trying to fix merge conflicts before they happen. ignoring all files that are generated on build
merge with head