commit by user2
doing simple merge