Null character ok
handled merge conflicts