Fix bug merging