commit from lab-pc
resolve conflicts