change conflict notice
make notice dismissable
update the readme