bug fix
fix people removal
fix merge