1st commit
Resolve conflicts