fixing project conflicts