some changes were made by user2
changes by user2
merged