Fix merge issues

Author: Fabiano Oliveira

src/main/java/xyz/fabiano/spring/localstack/autoconfigure/LocalstackAutoConfiguration.java

@@ -45,7 +45,7 @@ public LocalstackAutoConfiguration(
         @Value("${spring.localstack.services:}") String services,
         @Value("${spring.localstack.auto-remove:true}") boolean autoRemove,
         @Value("${spring.localstack.extra-options:}") String extraOptions,
-        @Value("${spring.localstack.version:latest}") String version) {
+        @Value("${spring.localstack.version:latest}") String version,
         @Value("${spring.localstack.region:us-east-1}") String region) {
         this.asyncClientsEnabled = asyncClientsEnabled;
         this.pullNewImage = pullNewImage;

src/main/java/xyz/fabiano/spring/localstack/legacy/LocalstackDocker.java

@@ -57,7 +57,7 @@ public class LocalstackDocker {
     private Collection<String> options = new ArrayList<>();
     @Setter
     private String version = "latest";
-    @Getter
+    @Getter @Setter
     private String region = "us-east-1";
 
     @Getter