added unconditional branch execution
fixed merge conflict