fixed some things
Resolved conflicts