fixing errors from user and offer
fixing merge confilcts