trying to fix things
adding merge