Merge Conflict Resolved

- DESEditAccountDetailsViewController.m conflict resolved.