Merging fix

Now merging check works correct