fix merge issues - banner module