reset author to michael
merged remote