resolve befor pull
resolve complict
complete backbtn