conflict test
conflicts fixed