added madagascar album
added london album
conflict resolution