Using doble quotes instead of single to mark strings
I don't always merge two branches, but when I do, I don't solve conflicts.