Modify profile
Resolve conflicts