Angular yazisi
conflict merged