resolved conflict
pick survey changes
changes
deleted file