trying to get merge working