OK, when you're done, go ahead an merge it to master yourself - Github is saying that it can't auto-merge - probably because there are some conflicts.