fix issus04
fix 5 issus
fix conflicts