* reverted some negative changes and checked correctness of merge