Ignore scripts
Merge conflicts