now patches seem to b merging fine