Fixing FPNumberPadView merge conflict