fix conflicts

Tablet/TableDirector.swift

@@ -166,6 +166,11 @@ public extension TableDirector {
         return invokeAction(.height, cell: nil, indexPath: indexPath) as? CGFloat ?? UITableViewAutomaticDimension
     }
     
+    func tableView(tableView: UITableView, willSelectRowAtIndexPath indexPath: NSIndexPath) -> NSIndexPath? {
+        
+        return invokeAction(.willSelect, cell: tableView.cellForRowAtIndexPath(indexPath), indexPath: indexPath) as? NSIndexPath ?? indexPath
+    }
+    
     func tableView(tableView: UITableView, didSelectRowAtIndexPath indexPath: NSIndexPath) {
 
         let cell = tableView.cellForRowAtIndexPath(indexPath)

Tablet/Tablet.swift

@@ -31,6 +31,7 @@ public enum ActionType {
     case click
     case select
     case deselect
+    case willSelect
     case configure
     case willDisplay
     case shouldHighlight