fix end of large string location
fix merge issues
fix string syntax issues