merge from lab6