line0 added to 3rd txt file
txt File3 conflict resolved