merge branches
error handler