resolved conflict in notebook