Github seems to think it's a clean merge. Why do you think it isn't?