Clean script
Merge conflicts fixed