remove unnessary empty lines
merge