remove lines made by conflict.