Just look at the commits, too much stuff. Look out for files that i resolved incorrectly.