fixed merge bug
consitent use of ldf across package