initial
added new patters
fix conflicts