added ninja
merge