Remove merge conflict artifacts
Remove merge conflict artifacts


EventBooking/angular-layout-page,EventBooking/vops-layout,EventBooking/vops-layout,EventBooking/angular-layout-page,EventBooking/angular-layout-page,EventBooking/vops-layout