Some changes
Merge and conflict fix