say no to merge conflicts
put back database
add links