Working front-end with receiving SNS
fix merge conflict