added instructions, fixed merge