fixed merging hopefully