files-monitored unignored
a few more merges