fixing conflict natually