conflicting stuff from laptop

playing with conflict resolution in github from laptop