resolving conflict and committing deletions from merge
adding control script