fixing merge heads