added some changes to introduce conflict
merged