Commented message received code
Fixed conflicts