minor changes
resolved confrict