Cleanup script
Resolved conflict