Resolved merege conflict.
#resolve DEV-20