feature finish fix for merge base file