fixed picking wrong file during merge