* add back error handler after resolving merge conflicts