new geometry_params
resolved conflicts
fixed merge conflicts