testing branch conflict - branch1
branch conflict master
committing branch conflict
branch experiment: changing name to big bird's diary
one more addition..
branch differences resolved