update feature to break conflicts with other features