reset ignored files
merge fix