fix merge conflict part 2