Ignore temp files
update merged options because lol