edit main.js and userCreate to handle conflicts