Add initial implementations of repo conflicts.