Fix merging bug