changes from laptop
resolve conflicts