commiting gitignore file
third entry into file1
fixing merge in file1