version 1.1 modded
modded v1.2 html
I resolved my conflict like a boss