Fix unremoved conflict.