christmas merge