hgt viewer  r6
fix conflicts