fix broken create_container call
fix merge