add feature1
confict fixed