done some stuff
fixes merge conflict