* resolve conflicts * remove .yarn/sdks * removed duplicate content Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>