Remove comments and conflict