Merge khanh and master