implemented the feature requested by backend
fixed conflict