Forgot to commit some stuff
Fixed
Fixed merge conflict