Wish I knew how to merge properly