commiting before pull
merging conflict in blog title