Merge fixin