updated merge

this fixes issues with <<<HEAD and SHA numbers.