Added confix information
merge fixed