Merged the changes