- fixed merge prob

Signed-off-by: G A <gdur.mugen@googlemail.com>