solve conflicts in utils