Commit for conflict in hotfix
Merged conflict