my today's update
concluding the merging