indentation and minor fixes
resolving conflicts
resolving conflicts