Post merge issue fixed