Resolved conflicts.

Signed-off-by: bazookan <aby.vinod@gmail.com>