small changes
fixing merge