Solved a lot of merge conflicts that accidently managed to get committed unsolved