Fix merge of platform.properties file