Removed merge confilct text, and added proper import to allow strictmode manipulation.