Remove ugly merge commit stuff