Test branch merge commit stuff