Fix merge of build.properties