finished with project add
fixed a conflict