final commit saturday morning
resolving conflicts