final changes
solved conflicts