Revert "resolving conflicts"

This reverts commit d6c71aae686cb10d350a344dbec4cb47315e42f0.
again doing same