some changes
conflit solved