ops, deleted committed
Conflicts fixed