Before merge with remote branch 18/12
After merge
Before merge
After merge
After fix conflic
Last commit