fixed header logo
fixed merge conflict
created models