copy changes
fixed conflict