Fixed more automerge conflicts
Fixed more automerge conflicts
Fixed more automerge conflicts: