stuff to fix things
fixed merge-conflict