add data to whiteboard
resolve conflict