02.02.14 git cannot into merging