lots of changes
fixing merge conflict