bug after merging