WIP conflict-solving get/post