somehow running solution
tried to resolve some merge
tried to resolve some merge