Free + lol
Fixed merge