added support for plain table view style headers
resolved conflicts