JAL-3066 remove git conflict file