fixing merge check