convert DTO fix
resolve conflicts with eclipse merge tool