add abc file
resolve confict file