[PATCH] openbsc[master]: TEST: branch without conflict, on 'merge if neccessary' mode...