Fix merge of build files.