* tightened security when edit user information
* fixed invalid merge file