get rid of bad line
merge