Fix Github conflict error