delete the "target" directories from both projects

These directories are not important and they produce a unnecessary
conflicts every time