some minor merge problems resolved. hopefully.