major changes done from server
resolving conflict