weird merging leftover