add a error line
Remove empty lines
Remove empty lines, and resolve conflict