pre-merge errors
post merge madness