Revert "resolving conflicts"

This reverts commit d2ebc5f71222052510e11111de6b8cc33c815cd2.