fixed bugs with merge
initial 1.6.4 update