Fix errorneous merge