Fixed 1-on-1s
Merge conflicts fixed