increased version number in the hope that upgrade-4.0.5.0.3-4.0.5.0.4.sql will take effect
trying to fix an error i made
merged conflicts (hopefully)