Replacing lost styles from the great merge conflict of 2013