vinay - merge erorrs finally fixed