finished mergin different branches. I'm going to make fewer branches in the future.