trying to move the counter down
fixed merge conflict