Removed extra github merge lines - Kevin (kchen87)