finalising that poem.
cleanup merge from poem to master.
resolving merge conflicts.