Moved script to a proper dir
Deleted the old script
Resolved conflict