fix merge issue because of binary files