Fixed some stuff
Resolved conflicts