github consider the merge is fine