Fix build file conflict