gettin up to date
fix confilcts
fix more merge confilcts