Trying to get merge to work again... merging....