Fixed wrong merge conflict.