git was giving an error when cherry-picking this file stating that it was " deleted by us\