fixed some compilations bugs
conflicts