Fixed forgotten unresolved conflict.