improvements to conflict fix script
add chomp command