Fixed merge commit stuff