Completed merging in main class file
Fixed the merge issue