added backspace options
resolve merge conflicts