fixed headers
merge issues
added destroy association