Allow updating foo when foo and foo.conf both exist