Update authorized_keys
resolve merge conflict
Merge branch 'dexxtreme-master'