new computer
fixing merge