Fixing conflict garbage