added inflow/outflow
resolved conflict