Fix merging error