API working
Resolved conflicts