finally got it merged ..i think