Fixed more merge conflict issues.