some changes
resolved conflict