Added some implmentation description
removed conflict