ignore compiled assets from search
merge conflicts