updates
fixing merge conflicts