updating stuff
fix merge conflict