fix BUG with some works unfinished
pull and push ,fixing conficts