Little changes
fixing merge conflict