modified BuildFile to avoid merge conflict