fixing conflict issues