modifications that will be ignored I think
merge conflicts i hate you