manually resovling conflicts