handle merges properly

dont give false errors when merging pull requests