12-7-2014 post
Fix merge conflict