working again

conflicts arising from not synching before working on home computer
resolved