Add test individual. Finaly it worksgit add .
Solve merge conflict.