Fixups
Resolve conflict