Some changes
Fixed merge conflicts