resolved issues1.1
Issue resolved
issue 1.2
conflict 1.1