- Made it automatically merge compatible.{nb}

Signed-off-by: ravi-sharma <ravi.sharma@kayako.com>