remove extra line from conflict msg..