fix other merge conflict in build file