Changes to resolve conflict and minor issues