Fix merge conflicts in environment.properties.