Made a lot of manual merges so that I can finally merge my branch to master