updated some stuff
resolved conflicts