* Change to dec and inc
* Fix conflict