add a line
resolve a conflict