Tested on Nexus 4, rooted, running 4.4.2, all merge conflicts resolved.