removed lines related with git conflig