manually merged because I do not understand git