Fixed merge bug in build file