set goals for sending to server
merge conflict