Adding some changes
fixed merging errors