Due to Conflicts Reverted Back yo Vijaya's Commit