First commit
Resolved conflicts