minor changes
solve conflics