Resolve properties file merge conflict with develop