resolving conflicts
final fixes to merge conflicts