Remove unresolved conflict.