Merge with Master (history function update)