Fixed merge conflicts and features not working fine.

Signed-off-by: Tushar Narayan <tusharnarayan@gmail.com>