resolved merge conflicts

Author: tamu-sad-iii

src/main/java/edu/tamu/app/model/Idea.java

@@ -21,6 +21,11 @@ public Idea(String title, String description) {
         this.elevated = false;
     }
 
+    public Idea(String title, String description, boolean elevated) {
+        super(title, description);
+        this.elevated = elevated;
+    }
+
     public Idea(ServiceRequest serviceRequest) {
         this(serviceRequest.getTitle(), serviceRequest.getDescription());
     }

src/main/java/edu/tamu/app/model/repo/impl/FeatureProposalRepoImpl.java

@@ -49,6 +49,8 @@ public FeatureProposal create(Idea idea) {
         idea.setElevated(true);
         idea = ideaRepo.save(idea);
         FeatureProposal featureProposal = featureProposalRepo.save(new FeatureProposal(idea));
+        idea.setElevated(true);
+        ideaRepo.save(idea);
         simpMessagingTemplate.convertAndSend("/channel/feature-proposals/create", new ApiResponse(SUCCESS, featureProposal));
         return featureProposal;
     }