@alitiknazoglu
i made a mistake. worked so hard on 2 different worktrees without merging them into main locally.
now merging them is causing a ton of problems.
whatever you do, split your codebase. even if you think two parts don't overlap or relate, they probably do.