attempting to reconcile changes
fixed merge