working on batches pages
fix merge conflict
updated batches page
 fixed mergeconflict