issues with merge