Task #125: Fixed merge conflict.