making merge changes
fixing merge conflict