fassade pattern is added
conflicts solved