gitignore .target
merged the conflict like a BAWS