Fix conflict after merging