commit not staged file
PopUpTableViewController
update interface
slove the conflict