Fix unresolved conflict.