slight update
resolving conflicts
first draft of pending page