Resolve merge conflicts between branches

Currently the code in the main, dev, other branches need to be merge together. However, some branch commits are behind others. You could solve this by making sure your branch on your computer is up to date with the main one on github, then add the changes you made to files in other branches manually and recommit, then delete the extra branches, or just keep them for records. 