edit project test to resolve conflic