some more git testing with testfile locally
keeping both remote as well as local changes