resolved merge conflicts
Revert "resolved merge conflicts"

This reverts commit 64bdf5340798a0c58bdab48d45611f4cb984c1c9.
added new constant