added references
fixed merge conflict and added raw/history files