bug fix: prevent parsing failure when merge