version updates and removal of <<< HEAD from merge