merge
error controller
trace log only in development