add new line locally
Add plan file
merge and commit
Line 2 added
conflict from branch addressed