final changes and merging asets work before meeting with fiona
merging