Commit that should create conflict
Fixed merge conflict 2