[spikder]

"and kept them in sync by having IntelliJ keep the branches in sync."

that's the sign that it should be one repo.