delete unused method
fix conflict
change updateable? to can? update