commit before conflict
Merge + Changes text in add after type