fix incliment function
merge