[Ronald] merge article 4
[Ronald] resolve conflicts