fixed multiple conflicts