fixed most of the post merge bugs.  Instructor said to drop the row editor primefaces component that isn't working.