schema/index changes
fixing merge conflict