minor changes
fixing conflics