Cesar Ramirez Removed conflicting file checks
814fb0c Nov 5, 2013
Removed conflicting file checks
814fb0c