local add 1
fix conflicts