Made it compile again
Resolved conflicts and added a few tasks