fixed merges