added receive
resolve conflicts