resolved project conflict