Merge noise fix