some changes
resolved conflict
resolved conflict