Merged code (by hand) in github editor