Some merging went wrong