Fixed incorrect merge conflict resolution
Merging with master
Merging with master
Still merging