removed conflict of merge