Fixing merge - seems to be acting oddly