Added code for api.
Fixed conflict.