after merge of gitfile and gitfileB