updated authkeys etc.
fixed conflicts