DataTransferObjects added and automapper added
conflict fixed