Added start and end frag files, removed by mistake
Conflict resolution