Integrating different modules into one solution
Handmade merge, dunno what I am doing