Got rid of -fpermissive, all build conflicts have been resolved