code review by hf: fixes some bugs

@@ -20,13 +20,7 @@ require('./back/email');
 require('./back/email-success');
 require('./back/new-password');
 
-<<<<<<< HEAD
 //绑定手机
 require('./bind/bind');
 require('./bind/code');
 require('./bind/password');
-
-=======
-// 绑定手机号
-require('./bind/bind');
->>>>>>> aaefe4b5074e522f16bdd6940a6387d6254a18f2