build file merged badly