several changes
solved conflicts