changed to solution
changed to solution and removed old fbase
merging
resolve conflic