Merge master with flexible entity