Bugfix field merging