added new line to test file
add .gitattributes file
add three
fix merge conflict