Resolved Conflicts in Letter Controller