Seeing what happens after pushing some_file.txt
Push should now work after resolving merge conflict for some_file.txt