Fixed Merge Conflicts and split sermonAddEdit into two separate files.