Made disclaimer small
Resolved conflicts