commit before pull
fixing merge conflicts
add articles