added counteis <script
fixed merge conflict
added counteis <script