Got merge working