Merge the lastest changes