resolving conflicts in scripts :/