removed conflict

removed conflict