Added section on API
Merging conflicts