Fix merge/rebase nonsense

Signed-off-by: Stefan Marr <git@stefan-marr.de>