added brach 2
added merged branches