validation stuffs
fix merge conflict
4:12 PM index sync