got rid of error resulting from merge.