reapply pop_fix lost when rebasing
update gitignores