Fixed the incorrectly resolved conflicts in commit 1d72ac9.