attempted merge - not working