fixed conflict issue with merge request