Format the 'new deck' erb
Update styles
resolve merge conflict