CHANGED to resolve conflicts