Fixed erronous merge