Added server objects
resolved conflict by using theirs