error handler
fix merge