fix for merging