print CONFLICTS at runtime
replace seems more reliable than rstrip