add github instructions
fix the merge