[BAM]Fixes: Merging conflict fixed