Remove edit conflict.