4/4 fix

removed duplicate lines from merge conflict.