FIX - restore merge conflict section