Merging fix