few changes
conflict fixes