updated to latest build
emails and various updates
merge error
email