Fixed 1 more merge conflict.