add missing method when resolving conflicts.