fixing dataserver and appdelegate
fixing conflicts