merge fixes complete / no buffer overflows etc.