Unfortunately you will have to file for ROC. You can apply for naturalization before removal of conditions, but you once your 90 days for ROC start you have to file for it within that time frame. Happened to me, my 90 days started when I already had the naturalization interview scheduled, so I had to file for ROC anyway 😢