Fixed conflicts

spring-rest-simple/src/main/java/com/baeldung/cors/Account.java

@@ -1,18 +0,0 @@
-package com.baeldung.cors;
-
-public class Account {
-    private Long id;
-
-    public Account(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-    
-}

spring-rest-simple/src/main/java/com/baeldung/cors/AccountController.java

@@ -1,24 +0,0 @@
-package com.baeldung.cors;
-
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@CrossOrigin(maxAge = 3600)
-@RestController
-@RequestMapping("/account")
-public class AccountController {
-
-    @CrossOrigin("http://example.com")
-    @RequestMapping("/{id}")
-    public Account retrieve(@PathVariable Long id) {
-        return new Account(id);
-    }
-
-    @RequestMapping(method = RequestMethod.DELETE, path = "/{id}")
-    public void remove(@PathVariable Long id) {
-        // ...
-    }
-}