fixed conflict for reals this time, removed paddin