merge and diff with phpstorm

https://gist.github.com/jvandyke/4355099