Trying to solve the merge conflicts
Merge remote-tracking branch 'github/master'
TableViewCell identifier assigned to avoid a warning