Removed remnant of unresolved conflict.