Fixing merges
Working sorta again.