Tried fixing merge, but it failed