Add missing files to ignore on merge conflict