fixed merges 5/19