changed gittest.txt
resolve merge conflict on gitte;xt.tx;t
added some changes to r2_test