merge fix

wtf learn to use semicolons guys ;P