fixed conflicts
message