merging fix