resolved some issues between branches