minor merging fix