data merge error fix for habitat