update latest content
conflict solved