Fixing conflict