test methods number 3
soved conflicts
modify about action
merge codes