resolved conflicts
idk
minor changes