Fix conflict

entrypoint.sh

@@ -55,13 +55,7 @@ new_version=$(echo "$raw_output" | grep -o 'new_version=\S*' | cut -d= -f2)
 # We should have all the information we need by this point
 # Set Outputs and log information
 
-<<<<<<< fix_action
 { echo "old_ver=$old_version"; echo "new_ver=$new_version"; echo "part=$part"; } >> "$GITHUB_OUTPUT"
-=======
-echo "old_ver=$old_version" >> "$GITHUB_OUTPUT"
-echo "new_ver=$new_version" >> "$GITHUB_OUTPUT"
-echo "part=$part" >> "$GITHUB_OUTPUT"
->>>>>>> master
 
 echo "Semantic Version Part to Bump: $part"
 echo "Current Version: $old_version"