Did some stuff
Resolved conflicts