conn info
fixed merge
added typerels