initial merge
added ingore rules