straightening out git merge

straightening out git merge nonsense

Signed-off-by: Michael Frohberg <michael.frohberg@gmail.com>