user actions
fix merge