fixed issue with merge
another attempt