confict test
merge fixed