Resolving Merge Conflict because I forgot to push to Origin Manuel before Merging