another merging error