Added new script
Merge conflict testing