Merging fix

Removed head missed at manual merge