add new line 3
handle conflict.