Conflict between them should be resolved soon

#1

Its not interesting to read it