it works but
merge errors fixed