fixing the weird conflict merge issue by rolling back to before it