Fix unsynchronized/wrong code that appeared on conflict