catch bugs in merge