tested live conflicts scanner

made some changes to doAddClass involving when to check for empty lines