Trying to make some conflict
Conflict resolved