Moved scripts to header
Resolved conflicts