fixed a bug due to head/tail-git-conflicts