Conflict between REL9_4_STABLE and master branch.

Hello hackers.

I found a strange thing. I hope it's not on purpose.

Example:
git clone git://git.postgresql.org/git/postgresql.git
cd postgresql
git checkout -b remotes/origin/REL9_4_STABLE
git merge master
MANY CONFLICTS

Why? 

Thanks. 
-- 
Uriy Zhuravlev
Postgres Professional: http://www.postgrespro.com
The Russian Postgres Company